Removing unneeded code + started changing examples.