Clean up unused logging
Refactor to remove unnecessary function wrapping.