Removed old functions