Removed unused variables and fixed subscriber retries.