Removed unused references; improved the demo