Cleanup in fluid template