remove "header" and assignmets which are defaults or bogus

Change-Id: Ibb45daba25d9ecc0ecf527aca0aebaebd7861863
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>