Patch namesapce break, remove obsolete comment.