remove depreciated fields