Yet more logs + cleanup