killing some old code