Hack and slash cleanup
Make 1.0 generate again. Cleanup.