Update headers, clean up.