More cleanup after plugin merge.