[24/11/14] removed unnecessary code added some examples, cleanup