Remove unnecessary omitempty