LPS-42340 Fix version compatibility
LPS-42340 Avoid not useful code