Clean out old function references