Cleanup JOIN/NEST operators