Fixes to RDY and go away from Rails dependency