Fix bug in the increment extension method.
Remove unnecessary check in billing manager.