Cleanup unused variables r=adrian