Remove duplicate code
Fix migrations with model mapper