Cleaning for new version