code clean up
hdr changed but useless