Removed Common.Logging dependency.
Performed some clean-up.