more todo items for deprecating