add TODOs for cleanup/deprecation