Removed the database class