Cleaned up database scripts