ditch some more externals