Remove redundant condition, enable for front end