Cleaned up demo scripts