(maint) remove commented
(PUP-1737) collapse mutually exclusive ifs together

This just speeds up execution a bit but cleans up readability quite a bit.