Cleanup and version edit