cleaning of s3g_rk abstractions