Removed old functions references