remove other case condition to improve performance