Removed unused imports and set package