Cleaned up migration