Add arch related clean up globs
Minor alphabetical re-ordering