Cleaning up contractor fields