Remove function call here, too