Merge "Finish cleanup CONF from auth"