removed TODO comment, merge already implemented
removed TODO comment, merge already implemented


CM4all/beng-proxy,CM4all/beng-proxy,CM4all/beng-proxy,CM4all/beng-proxy,CM4all/beng-proxy,CM4all/beng-proxy