Fix/remove plugin occurency