Minor cleanup.
Updating, renaming, and stripping the old plugin.