IA-291 Cleaned up demo code.