clean up circular imports and remove * imports