Bug fixes
Removed messages