Clean up Increment and IncrementCounter