cleaning up some things for south migration