removed unused messages and replaced with forms errors