Authentication clean-up