LPS-51175 Remove unnessesary namespacing