Cleaning up new field templates