Arthuryan/remove pup windows

@LeoCavaille 
For review purposes only. Not to be merged yet. 
As we were discussing, impossible to use something like that here.