Fixed another bug where setup got called twice because I forgot to totally remove a variable.