remove uneeded logging, remove future after complte, do 1 branch for quick path no expiry