Clean up the walking logic.