KNOX-250 - cleanup