Removed some old unused stuff