(plugins) Clean useless dependencies
(frontend) Minor refactoring