Added better TODO
Removed files