[BUGFIX] Fix cgl cleanup introduced bugs

Introduced by FluidTYPO3/vhs#513