#4137 Cleanup RO Start code
#4137 Continue RO Cleanup