Windowgram class usage cleanup