Removed wsf_support, which is useless and unused
Cosmetic, improve readability of conditions