-- UCCPAR-425, more code cleanup
Merge pull request #36 from pradpnayak/UCCPAR-425

-- UCCPAR-425, more code cleanup