adding cleanup step and renaming collectin_name to db_name