OPAL-1929: Removing commented out code