cleaned unused fields