Remove nextId stuff - it doesn't belong here
0.4.0