clean up for os x
fix C demo
remove CL things for now