Removed some depreciated code