Fixing cleanup of info windows and scoping issues