Simplify Delivery/Poison class hierarchy