Arthuryan/remove pup windows

@LeoCavaille 
For review purposes only. Not to be merged yet. 
Let's make sure noone of these show up when you run the info command.