removed more old functions that have been replaced