remove commented out code
group the extension stuff
fix busted log method
Merge branch 'refactor/extensions'