Added fields cleanup module