IDGenerator cleanup