Remove hard-coded function calls