diff --git a/components/db_ido_mysql/schema/mysql.sql b/components/db_ido_mysql/schema/mysql.sql
index 545e6fa52..080898dcd 100644
--- a/components/db_ido_mysql/schema/mysql.sql
+++ b/components/db_ido_mysql/schema/mysql.sql
@@ -1398,10 +1398,6 @@ ALTER TABLE icinga_servicechecks ADD COLUMN endpoint_object_id bigint default NU
 ALTER TABLE icinga_statehistory ADD COLUMN endpoint_object_id bigint default NULL;
 ALTER TABLE icinga_systemcommands ADD COLUMN endpoint_object_id bigint default NULL;
 
-ALTER TABLE icinga_servicestatus ADD COLUMN check_source_object_id bigint default NULL;
-ALTER TABLE icinga_hoststatus ADD COLUMN check_source_object_id bigint default NULL;
-ALTER TABLE icinga_statehistory ADD COLUMN check_source_object_id bigint default NULL;
-
 
 -- -----------------------------------------
 -- add index (delete)
diff --git a/components/db_ido_mysql/schema/upgrade/0.0.9.sql b/components/db_ido_mysql/schema/upgrade/0.0.9.sql
deleted file mode 100644
index 5786c74ca..000000000
--- a/components/db_ido_mysql/schema/upgrade/0.0.9.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-
-ALTER TABLE icinga_servicestatus ADD COLUMN check_source_object_id bigint default NULL;
-ALTER TABLE icinga_hoststatus ADD COLUMN check_source_object_id bigint default NULL;
-ALTER TABLE icinga_statehistory ADD COLUMN check_source_object_id bigint default NULL;
diff --git a/components/db_ido_pgsql/schema/pgsql.sql b/components/db_ido_pgsql/schema/pgsql.sql
index ed96d8c18..c30e9e50d 100644
--- a/components/db_ido_pgsql/schema/pgsql.sql
+++ b/components/db_ido_pgsql/schema/pgsql.sql
@@ -1426,9 +1426,6 @@ ALTER TABLE icinga_servicechecks ADD COLUMN endpoint_object_id bigint default NU
 ALTER TABLE icinga_statehistory ADD COLUMN endpoint_object_id bigint default NULL;
 ALTER TABLE icinga_systemcommands ADD COLUMN endpoint_object_id bigint default NULL;
 
-ALTER TABLE icinga_servicestatus ADD COLUMN check_source_object_id bigint default NULL;
-ALTER TABLE icinga_hoststatus ADD COLUMN check_source_object_id bigint default NULL;
-ALTER TABLE icinga_statehistory ADD COLUMN check_source_object_id bigint default NULL;
 
 -- -----------------------------------------
 -- add index (delete)
diff --git a/components/db_ido_pgsql/schema/upgrade/0.0.9.sql b/components/db_ido_pgsql/schema/upgrade/0.0.9.sql
deleted file mode 100644
index 0d6b0de87..000000000
--- a/components/db_ido_pgsql/schema/upgrade/0.0.9.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-
-ALTER TABLE icinga_servicestatus ADD COLUMN check_source_object_id bigint default NULL;
-ALTER TABLE icinga_hoststatus ADD COLUMN check_source_object_id bigint default NULL;
-ALTER TABLE icinga_statehistory ADD COLUMN check_source_object_id bigint default NULL;
-
diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index 4d00620e7..208e516fa 100644
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -145,14 +145,7 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields(void) const
 		fields->Set("output", CompatUtility::GetCheckResultOutput(cr));
 		fields->Set("long_output", CompatUtility::GetCheckResultLongOutput(cr));
 		fields->Set("perfdata", CompatUtility::GetCheckResultPerfdata(cr));
-
-		String check_source = cr->GetCheckSource();
-		fields->Set("check_source", check_source);
-
-		Endpoint::Ptr check_endpoint = Endpoint::GetByName(check_source);
-
-		if(check_endpoint)
-			fields->Set("check_source_object_id", check_endpoint);
+		fields->Set("check_source", cr->GetCheckSource());
 	}
 
 	fields->Set("current_state", CompatUtility::GetServiceCurrentState(service));
@@ -894,14 +887,7 @@ void ServiceDbObject::AddStateChangeHistory(const Service::Ptr& service, const C
 	if (cr) {
 		fields1->Set("output", CompatUtility::GetCheckResultOutput(cr));
 		fields1->Set("long_output", CompatUtility::GetCheckResultLongOutput(cr));
-
-		String check_source = cr->GetCheckSource();
-		fields1->Set("check_source", check_source);
-
-		Endpoint::Ptr check_endpoint = Endpoint::GetByName(check_source);
-
-		if(check_endpoint)
-			fields1->Set("check_source_object_id", check_endpoint);
+		fields1->Set("check_source", cr->GetCheckSource());
 	}
 
 	fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */