Getting rid of flashmessage calls