Fix install and remove