Removed depreciated code