Control data is moved to BaseData
cleaning