Forgot to remove a few references to ${classifier}