UCJEPS-514: minor cleanup...remove commented out lines