Cleaned up client generators.