Remove unnecessary is_moving checks