Removed unit dependency from effect/behavior collections