Clean-up new flashing message commit

	Some OCD fixes for flashing message
	Remove all the extra code added from last commit