Removed old unused stuff