Minor housecleaning