All of your surplus message concerns will be addressed, in one way or another, in 1.18. Muahahaha! Muaha?