initial plugin cleanup
merge