cleaned up updateMotions