First part of OreStack removal