cleanup
port to tornado 4.0