More cleanup and plugins