Clean up of return to lobby code