Revert "Revert "Remove some stuff 4.4 style""

This reverts commit c0e4a5a08f075ee70cfa00f89f295f8bb928a24e.
Revert "Revert "Remove some missed stuff""

This reverts commit a8429757cb624eeb43d75bfd84b41e8528d7edde.
Art needs this bit