A small amount of cleanup