CONN-588:cleanup
CONN:588-cleanup
Merge pull request #578 from alameluchidambaram/CONN-588-MustUnderstand

CONN-588:cleanup