Ruby role cleanup - WIP (2)