EF Demos Complete - Cleaned Up