<cleanup/refactoring> removed some unused code, marked some problematic areas
<unstable> Merge branch 'cleanup/refactoring' into unstable

* cleanup/refactoring:
  <cleanup/refactoring> removed some unused code, marked some problematic areas
<DA-429> (iOS) set highlighting to false when challenge is cancelled
<unstable> Merge branch 'DA-429' into unstable

* DA-429:
  <DA-429> (iOS) set highlighting to false when challenge is cancelled