Cleaned up the DEMO