CommonUri: additional cleanup added