Window header clean up