I did not spend that much time on currently unused code. We'll see if this is still needed and if so I will fix the CGL.