Removed keep-alive from TODO