Remove todo; this isn't really being used anymore