get rid of waldi and illumination_service