Removed unnecessary namespace aliases