cleaned up some old code