Remove deprecrated objects