Added ability to uninstall and unuse units