Remove TODO comment and debug println.