Clean out some old code