Cleaning up some old stuff that shoudl be gone