Removed old unused stuff.