A little cleanup around about