[FXOS-135] cleanup, remove TODO