Get rid of a few Dynamic types, remove unused MotionType enum