Add some logging.
Clean up.