Removed various unused imports, assignments and classes

@thieman Merging.