cleaned up migrate