Pre-refactor

Simplifying movement routines for performance reasons; removing
'cancel/reposition' code