reorder, remove manifest references