Added examples and removed a couple of FS calls
Cleanup of old code
Remove Filesystem access
Merge branch 'remove-fs'