Remove 1.5 specific changes from upgrade script