Remove unused class inheritance (and imports)
Update TODOs.
Merge branch 'development'