Moved a core plugin to the core file, and removed some dev stuff.