Update some TODOs.
Remove unused method.
a
b
Add basic exception handling.