A little more last minute clean up