Remove fields that shouldn't be there