cleanup, updated to use v2.0 of the core plugin