added a removeListener on geometry window unload