Cleaning out some old bits