add a TODO(cleanup) to remember to revisit this after transition