Gets rid of seawater.gibbs and more cleanup