Centralize vault cleanup