[Shim] Better logging
[All] Cleanup