big clean up, add migration instance