pre motion estimation cleanup/bugfix