Drop obsolete code
More code cleanup
Merge pull request #171 from asergi/master

Drop obsolete code / Huge patch ! Thk for your work Alessio !!!