cleanup and update for walker