Removing code smells found from static analyzer.

Mostly packages that were required and then never used.