Remove TODO in dev branch