Remove zero-upgrade state, assume that it's initially part of the single use good