Removed unused imports and variables from all classes