Some cleaning up
More cleaning.
Examples working again