Add comments and remove unused plugins