removed old functions class