Cleanup. Plugin-support.