Remove multi-field definitions for specs to pass