Removed reference to window