just some more housecleaning