Continue cleanup, now plugin code