1.5 - fix unnecessary else statements
3 files changed