Rewrite mass storage buff removal