Cleanup some old logging

Test Plan:
- None