cleaning up and migrating