Rework header, remove row/columns