Got rid of a bunch of useless code