Injection: cleanup & minimize Shred usages