Plugin cleanup and sync with current upstream master (only visual, not code-structure)