remove gazetteer from here