clean up cruft in prep for addition of new features