Fixing circular dependencies
clean up unused imports