lots of cleanup for 1.0.0