For all usages, it looks like this was unnecessary.
Closes #3383.
Also cleans up some weird code
They may have been delayed until the next Update, which is too late in this case.