Refactor

- Remove unnecessary imports
- Remove unnecessary declarations