Cleaned up database create script