Clean up some old stuff