Try undervolt + cleanup again

This reverts commit fc1282d1dcb18664ef1eb4a5b2a522c5c99a371b.