Revamp shutdown