Also do we remove "warehouse" as well?