#543 removing a few prefixes