OPAL-1498: removed commented code