Fixes: #2586 Removed recursive_move method