Arthuryan/remove pup windows

@LeoCavaille 
For review purposes only. Not to be merged yet. 
@remh