Trying to remove spurious variables, still hackish