plugin.py cleanup