Database-Cleanup
Fixes Ticket #147