Removed more external concept code