Remove dead code
Run vet when building