VID-1213 simplify logic, remove sloth from rail module