convert cql operators to constants
remove unused function + tests
remove debug messages