Responder internal API cleanup