cleanup a few imports from tornado 3 upgrade