Got rid of unused imports and old variables that don't do anything
anymore.