Info window cleanup as per Davids request