Moved comment code to plugin