minor build flow cleaning