Cleaning the field types code