Removing old TODO statement