clean up a few duplicate things