Add TODOs and remove log statement

ISSUE=#2