Clean Up for DB changes