Remove dead code
Remove useless subclassing

This code has interesting history :D