cleanup for the new version
new version