EPG-34487 - fixed typo, build cleanup