Cleaned up database startup