Redo poll adaptation
Strings cleaning