wip
wip: before clenaing headers
wip