Remove more dead code
Adjust flay score