Remove some module headers that are not used anymore
Be more descriptive