Removed some third party unneeded code
Updated examples