Code cleanup
Calling both dbsources for testing