cleaning up some old code