Updated Todo and removed some commented code