further clean up to simd/common