removed completion-listener

it was a quick solution, it was in my mind to refactor before sending PR.
I guess you know what it does, so do you have a better name in your mind ?