CONN-1351: Removed unwanted code (addressed the peer review comments)