Removed TODO related to previous commit