Remove DatabaseConnector

Replace with Datasource