cleanup + dont validate/update readonly fields