refactor: simplify effect cleanup changes