Fix install and remove scripts