Clean up unused external parts
Clean up unused external parts