Removed some deprecated api