Remove some stuff 4.4 style
Remove some missed stuff
Art needs this bit