SHUBNET-22 cleanup