Style fixes.
Removed unneeded files.
Updated TODO