Remove unneeded code and add add TODO for send response