Removed Auto-gen stuff