Removes several more unused variables