Remove references to nonexisting functions