Revert "added review comments for the fix for bug USERGRID-22, ICLA - Malaka Mahanama"

This reverts commit e186568e0f32a78fee53b2006691337def1729e3.
Revert "fix for bug USERGRID-22, ICLA - Malaka Mahanama"

This reverts commit dbfd345b9ba68040a6728e794d3742cfd90d3175.
Revert "Addressing JIRA USERGRID-113, ICLA - Malaka Mahanama"

This reverts commit 55dfccacd3a0eecb3a3669fcfd5769ded7618d5c.