cleanup and trying to sort auth