Cleanup, invoke partial helper directly, far less costly