header clean up based on p350 camera fix