Remove functionality that will remain outside of rtwo, at least for now.