AUTH clean up