DELTASPIKE-289 WindowContext cleanup