Cleanup CQL code

[costateixeira]

At a first impression, it seemed that the CQL code contained definitions that are not used. While this should not have a big impact on performance, code quality would be important for implementers.
We should try to remove all unused code from the CQL.