AH-247 Changes to headers.

removed unnecessary variables.