Renamed header signature name.
Removed unused code.