LIB-75
LIB-75 : Moved validation strategy + removed unused code