-- UCCPAR-425, more code cleanup