more cleanup (work in progress)