Small refactorings, status updates. Removed plugins