Removed more deprecated stuff accidentally imported