Several cleanings and plugin+deps updates