Minor plugins cleanup