remove swp, add replacing header util