removed redundant externals (since we are building a monolithic system anyhow)
cosmetic fix