Cleanup Rodas prior changes