removing MotionData scaffolding phase 3