Remove hardcoded db name