fixed errors Issue #516
remove old messages Issue #516