Update to new comment style in sample files
Remove defaults.cb in favour of a method of generating it automatically