Various DB and Migration Clean-Up II