20140501-2026. clean out old code