Changes for 2.0

Lots of cleanup.