Make unblock work with tokens or reservations.
Make sure blocks are removed when their reservation is removed.