Remove fields when not given