Optical cleanup