[plugin] cleanup

Change-Id: Ib37ba13689974c19567e03079ded9be8f3253a50