Plugin Cleanup
views class cleanup
Organization page drop in