Many quality of code changes

Removing unused imports, cleaning up (at a base level) code, and removing some package declarations. By no means did I get all of them.