removed more deprecated and old code