KER-291: Code cleanup