Removed order and mask_order from a few missed files