Comment out some conflicting mappings