reorder/remove some stuff