removes MotionMap dependency