unnecessary calls to setFlashMessage removed