Added field cleansing