Cleaning Up an Auth Service