Removed not needed example.
Small updates and fixes.