Fixed Client not removing tick timer in end callback