KAA-182: Small code/resources cleanup