[plugin] Cleanup

Change-Id: I85ef16e2786bdf6fe701d87237e866f1e942c8b2
[plugin] Fixed syntax error

Change-Id: If4a4655f0bc9721d84acaf8909dae7bb9454e3f4