Fixed an issue with unique constraints
Cleanup of migrations