continued GA part cleanup for Beam 5 release