improving uninstall behaviour

Storage Service can now be uninstalled properly

Refs #6359