Remove deprecated name_id_type
Clean up blockchain header includes