Clean up make_db using db_session