(Rice) Get rid of unused variables
(Rice) Clean up more unused variables