Removed unused imports and variablesX