remove depreciated code