Major plugin cleanup