[b2s] code cleanup