removed some old crud