Remove more out of date stuff
Remove more out of date stuff