Remove TODO commit from code