Some housecleaning