clean up in prep for version 2.0