CON-381 | Lazy rail code simplified