[Remove Comment Notes] Support