Get rid of some backward stuff we no longer need
More things we don't need with the latest versions