Housecleaning... part deux