CONN-727: Code clean-up