Remove stateful dependency