remove the blk header and 2 more problems