Implemented initiationHeader forwarding & removed dead code