Cleaned up database and models