Remove duplication at builtin plugins code

Fixes: #12