remove unneeded mach* but if needed will add them back