remove some deprecated stuff, adjust subscribers