More housecleaning updates