Cleaned up main migration