remove unused fields"