Update plugin header
Misc code quality tweaks
Remove unused methods