Removed old stuff from assignment8 branch