Added some code for database cleanup
Removed unnecessary comment
Removed obsolete commented-out code