Added TODO
Removed unnecessary lookup code