remove unneeded code
upgrade twisted requirement (because of the new(er) web stuff)