More receiver cleanup