OPAL-1849: Cleaning commented out code