KNOX-250 - resource cleanup