stable 4, clean up headers