Move Product_Brand and Product_Manufacturer back to device