remove 32 and 64 swap