Clenup after Database test

 - Close the DB before trying to remove it
 - Removed a few line in TODO.txt