Remove an import loop
Remove some unnecessary SOURCE imports