Headers cleanup