Clean up and update version number