removed some depreciated code