Maybe clean up hacky shell outs.