Format the common warnings, drop unneeded window refs