CONN-1213:Code cleanup