Removes more unused variables