More Auth Clean-up