Update devtools
Remove unused class
Simplify method expansion