refactor, remove expireAt method from the contracts