TRUNK-3289 Remove comments