UCCPAR-431
-- more cleanups
Merge pull request #48 from pradpnayak/UCCPAR-431

Uccpar 431