Remove unnecessary logging dependencies
Minor cleanups