OPAL-2190: Removing commented out code