remove fluid tag on flash message
remove unused matcher spec