[RFC] Storage based service retrieval + removal