Merge "sched: Cleanup unused variables in walt"