clean up a few more things from the wrap