remove some unnecessary namespace prefixes