Add TODOs and remove AWS stuff from T3 CPI