Router: Remove function call from loop header