Trying to prevent a race condition.
Removing deprecated code.