Removed the database stuff