Revert "Revert "11.16 delete some stuff""

This reverts commit d6f76d61665a9370f77644ff88f39eb2d52e205c.