final demo cleanup for 1.6.1
1.6.1 final