More code cleanup after removing command line play.