Header todo removed