roll in EZH's puppet module cleanup