A lot of housecleaning