Some clean up and prepare for version display.