Remove a bunch of unneeded code