remove host specific fish stuff
more laziness