[16-11-2013] Some 'unnecessary' lines removed