Code

Cleanup and statement re: contrib plugins