OPAL-1681: Removing commented out code