OP-1354 Removed commented code