Class fixes - deleted unused imports, deleted strange line changes.