Add a TODO to cleanup the backwards compatibility code