buildandro: code cleanup