removed old functions and comments