Reversed changes to contract as they broke functionality.
Removed unused items from DBInterface/TestDBInterface