Optimize build result, remove CLI from core