separate storages and make sure map_storage is compliant
improved error handling in RemoveImage