Got little errors resolved for ride modal and (some) unnecessary old code removed