Remove redis.keys from remove_delayed_selection
Add optional class matching to remove_delayed_selection
Refactor remove_delayed_selection