removed some old stuff