Delete generation stubs.
More fixes and deletions.