Ruby role cleanup - WIP