A little bit of housecleaning