OPAL-2470: Removing commented out code