Remove unused header
Remove unused packages
Fix headers and comment dead code.
Remove dead and commented code
Merge pull request #75 from aplanas/master

A set of commits to detect dead code and clean the headers