remove nnecessary 'else' block