Remove unnecessary Comment ability code