Removed fixed TODO. Cleaned up logging
2 files changed