Removed circular import, and removed code specfic to setupall, which was removed