Removing a few more unused variables