Remove deprecated items and fix slot ordering. (cherry picked from commit f05891405ab40502cfa67fdcff0edb1391ff8719)