Plugin cleanup work
7 files changed