updated versions and cleanup