[rfpkg/f30] (3 commits) ...cleanup