Removed old function calls