Assert return value of all plugin commands
Remove unused variables