Remove trailing whitespace
Account for proto files that set their own Java package

This gets auto-inflated by proc and resulted in the wrong target being
returned by this module.
Remove commented out code
Remove debug lines