remove unused fields