Merge "Remove unused basebuild files"