Cleanup, and start over from Dec-2013 version.