Add more logging + cleanup.