Some housecleaning.