OPAL-1682: Removed commented code