Cleaned & updated plugins