Removed some old stuff