OPAL-2254: Cleaning code