a bit of housecleaning