OPAL-1910: Deleting commented out code