FIX: build result cleanup