Update headers and cleanup