Refactor: Remove unnecessary imports