Removing old TODO