Removed more deprecated functionality