clean up agents a bit and use message filtering functionality