move legacy token delete to finally clause to ensure it happens.