Deleted commented-out-code from else if statements