Remove delivered status

* Remove delivered status
* Rename status labels