Code clean up as per Code Analytics Plugin.

This build fine on my machine. No phantom dependencies should exist. Tests pass.