remove soem AF headers

Change-Id: I792c630a626698a15f5e4a90d2c01c69426f2a0b