Rename control signals
Remove control from .xise file