Cleanup ref 69142e7