Cleaned up initial db creation