Some clean up of the demo and older samples