Create a ticket for the auth cleanup work and start implementing it.
