Remove unused packages
Fix headers and comment dead code.