Removed some deprecated methods