Clean-up in ObjectGenerator.