These are just cluttering things and adding an element of "how does this work?" because base_image_util was defaulting to the "usb" layout in some places and "base" in others.