Added limit on messages
Clean up