remove todo from the code

Change-Id: I3b38cbc5188d8df680181479f1db69ca6250fa1b