Eliminate unneeded else