The big 1.0 cleanup