Cleanup in headers