Updated setup/remove scripts.