slashed & burned

Got rid of a bunch of superfluous code.