Remove some stuff 4.4 style