More cleanup for the plugins and the markup