clean up some prefixes