Fix deliver(y) filtering.
Clean up