Refactor: Database: Remove unused code