Lint and remove package module.

The package module is no longer required and flake pointed out a couple
of lint problems that needed taking care of.