Yet more housecleaning...