Removed extraneous data sources and updated to us new data base objects