CAL-352 clean code to remove deprecated classes and methods
Merge remote-tracking branch 'origin/feature/relooking' into feature/relooking/CAL-351