minor cleanups; removed event listener on win cls