Cleaned up database initial create