[cleanup] More cleanup in the wake of the previous commit