diff --git a/components/compat/compatcomponent.cpp b/components/compat/compatcomponent.cpp
index dd4570dd0..16b7aba4f 100644
--- a/components/compat/compatcomponent.cpp
+++ b/components/compat/compatcomponent.cpp
@@ -603,9 +603,9 @@ void CompatComponent::StatusTimerHandler(void)
 		tempobjectfp << std::fixed;
 
 		tempobjectfp << "define hostgroup {" << "\n"
-			 << "\t" << "hostgroup_name" << "\t" << hg->GetName() << "\n"
-			 << "\t" << "notes_url" << "\t" << hg->GetNotesUrl() << "\n"
-			 << "\t" << "action_url" << "\t" << hg->GetActionUrl() << "\n";
+			 << "\t" << "hostgroup_name" << "\t" << hg->GetName() << "\n";
+
+		DumpCustomAttributes(tempobjectfp, hg);
 
 		tempobjectfp << "\t" << "members" << "\t";
 		DumpNameList(tempobjectfp, hg->GetMembers());
@@ -636,9 +636,9 @@ void CompatComponent::StatusTimerHandler(void)
 		tempobjectfp << std::fixed;
 
 		tempobjectfp << "define servicegroup {" << "\n"
-			 << "\t" << "servicegroup_name" << "\t" << sg->GetName() << "\n"
-			 << "\t" << "notes_url" << "\t" << sg->GetNotesUrl() << "\n"
-			 << "\t" << "action_url" << "\t" << sg->GetActionUrl() << "\n";
+			 << "\t" << "servicegroup_name" << "\t" << sg->GetName() << "\n";
+
+		DumpCustomAttributes(tempobjectfp, sg);
 
 		tempobjectfp << "\t" << "members" << "\t";
 
diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp
index 489311cd4..92ba03873 100644
--- a/lib/icinga/hostgroup.cpp
+++ b/lib/icinga/hostgroup.cpp
@@ -39,8 +39,6 @@ HostGroup::HostGroup(const Dictionary::Ptr& serializedUpdate)
 	: DynamicObject(serializedUpdate)
 {
 	RegisterAttribute("display_name", Attribute_Config, &m_DisplayName);
-	RegisterAttribute("notes_url", Attribute_Config, &m_NotesUrl);
-	RegisterAttribute("action_url", Attribute_Config, &m_ActionUrl);
 }
 
 HostGroup::~HostGroup(void)
@@ -63,16 +61,6 @@ String HostGroup::GetDisplayName(void) const
 		return GetName();
 }
 
-String HostGroup::GetNotesUrl(void) const
-{
-	return m_NotesUrl;
-}
-
-String HostGroup::GetActionUrl(void) const
-{
-	return m_ActionUrl;
-}
-
 HostGroup::Ptr HostGroup::GetByName(const String& name)
 {
 	DynamicObject::Ptr configObject = DynamicObject::GetObject("HostGroup", name);
diff --git a/lib/icinga/hostgroup.h b/lib/icinga/hostgroup.h
index 91d628888..7399368ff 100644
--- a/lib/icinga/hostgroup.h
+++ b/lib/icinga/hostgroup.h
@@ -45,8 +45,6 @@ public:
 	static HostGroup::Ptr GetByName(const String& name);
 
 	String GetDisplayName(void) const;
-	String GetNotesUrl(void) const;
-	String GetActionUrl(void) const;
 
 	std::set<Host::Ptr> GetMembers(void) const;
 
@@ -57,8 +55,6 @@ protected:
 
 private:
 	Attribute<String> m_DisplayName;
-	Attribute<String> m_NotesUrl;
-	Attribute<String> m_ActionUrl;
 
 	static void RefreshMembersCache(void);
 };
diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index 89b1da4c6..3b4a6a02d 100644
--- a/lib/icinga/servicegroup.cpp
+++ b/lib/icinga/servicegroup.cpp
@@ -40,8 +40,6 @@ ServiceGroup::ServiceGroup(const Dictionary::Ptr& serializedUpdate)
 	: DynamicObject(serializedUpdate)
 {
 	RegisterAttribute("display_name", Attribute_Config, &m_DisplayName);
-	RegisterAttribute("notes_url", Attribute_Config, &m_NotesUrl);
-	RegisterAttribute("action_url", Attribute_Config, &m_ActionUrl);
 }
 
 ServiceGroup::~ServiceGroup(void)
@@ -64,16 +62,6 @@ String ServiceGroup::GetDisplayName(void) const
 		return GetName();
 }
 
-String ServiceGroup::GetNotesUrl(void) const
-{
-	return m_NotesUrl;
-}
-
-String ServiceGroup::GetActionUrl(void) const
-{
-	return m_ActionUrl;
-}
-
 ServiceGroup::Ptr ServiceGroup::GetByName(const String& name)
 {
 	DynamicObject::Ptr configObject = DynamicObject::GetObject("ServiceGroup", name);
diff --git a/lib/icinga/servicegroup.h b/lib/icinga/servicegroup.h
index 16e5fdaba..cec760ce9 100644
--- a/lib/icinga/servicegroup.h
+++ b/lib/icinga/servicegroup.h
@@ -45,8 +45,6 @@ public:
 	static ServiceGroup::Ptr GetByName(const String& name);
 
 	String GetDisplayName(void) const;
-	String GetNotesUrl(void) const;
-	String GetActionUrl(void) const;
 
 	std::set<Service::Ptr> GetMembers(void) const;
 
@@ -57,8 +55,6 @@ protected:
 
 private:
 	Attribute<String> m_DisplayName;
-	Attribute<String> m_NotesUrl;
-	Attribute<String> m_ActionUrl;
 
 	static void RefreshMembersCache(void);
 };