clean up for new version