Cleared out some unused imports due to the refactor