SLICE-56 - code cleanup