Refactor of RT API to accomodate kOS refactoring.  Cleanup.