[fix] use removable comments and fix plugin usage