remove old function calls