cleanup more unused variables