OPAL-2077: Cleaning comments