KER-253: Code cleanup