Clean up some old code