More cleanup. Revert Logger.c

Change-Id: Ia8f84a3ce097641ad44ef2e46cf5362131dbbe9b