Cleaned up `Evaluators.remove()`. This should avoid the error found on the build server and make #935 unnecessary.