CAL-425 Remove unnecessary properties and related configuration. Updates some labels.
Merge remote-tracking branch 'origin/feature/relooking' into feature/relooking