Oops, remove testing conditional
Fix account routes weirdness