Removed a whole bunch of unneccessary junk