UMS Storage removal by @Ryccardo