Add TODO.
Remove obsolete code.
Add tests with callbacks.