Clean up UserAuth code