Removed more window references