Clean up the samples for inclusion in the 4.1 installer

house keeping #60
fix build