Add cleanup to upgrade script<br />Fixed edit item preview