Fixed Messages
Removed enabled flag