Removed dependencies.
Updated TODO.