Removed some deprecated functionality