Simplified master/slave demos. Removed vestigal components
Removed unused component