clean up and 1.0 commit