Fix missed conflicts
Remove serializer mappings (out of scope)