Sender removed again because it's not necessary, comments added and code cleaned
Sender removed here also