[TASK] Remove TODO annotations