Removed deprec comments, removed redudant namespace::, comment