Clean up extraneous BUILD file entries

Left over from previous refactors