Cleanup for new version