Do not rely on number of ticks but rather clean up properly