Working draft stop on reply messages. Build/Cleanup.