removed mode if statement