Update and cleanup input format mappings