Removed some old unused stuff, cleanup