Modernize a bit
Remove more things