Cosmetic
Revert "Cosmetic"

This reverts commit 194ea49d4aa590c9879ead24e279d047f67fa70d.
Revert "Fix memory leak in querywindow"

This reverts commit 710930ccd9a8e356c78dcd4652f1ae9f681c6474.