Remove completed TODO
Simplify references to rayo core