Remove deprectaed stuff.