Fixed issue with shift for install/uninstall, removed current method to be inline instead