Simplify upgrade drop code