removed more unused variables and deprecated debugging