remove other changes not necessary with model field fix