Remove usage of s-concat