Removing control signal stuff