Cleanup redundant else statements find via golint #11602

Signed-off-by: George MacRorie <gmacr31@gmail.com>