removed more deprecated stuff