cleaning up some old stuff