Cleaning up Auth Service