A little housecleaning