CONN-853i: Updated by removing unsed methods.