Remove unused OperationCount and fix remove variable