Removed Typica dependencies, add redelivery count