Cleanup unused variables in control.vhd