Add deprecation_warning and remove TODO?