Plymouth shutdown improvement