clean up some old code