Modernizer run
Unused vars removed