Removed non-required fields