Cleanup of new version