Nuked old service stuff
Added #upgrade, which I somehow missed...
More cleanup