Deleted depreciated code