UCJEPS-474: Remove commented-out markup, clean whitespace