found and cleaned up a couple more old function calls