Added TODO.
Removed useless stuff.