remove unnecessary if
cope with bad pay tiers (bug 878323)
add in methods (bug 881778)