[azbox] build cleanup part 2 not ready yet