Removed window-number