SSLR-250 Remove duplicated code