Clean up for older messages sent from client
Merge pull request #16 from aphex/master

Clean up for older messages sent from client