Removal of database - 2 - WIP