remove deprectaed structure