Deleted unused imports and helpers