Merge "remove dead code, add missing RESTORE_XMM"