simplify and clean up
dual remove dual import